1. 19 Oct, 2022 2 commits
  2. 13 Oct, 2022 3 commits
  3. 23 Sep, 2022 4 commits
  4. 20 Sep, 2022 2 commits
  5. 19 Sep, 2022 1 commit
  6. 14 Sep, 2022 1 commit
  7. 09 Sep, 2022 6 commits
    • Sascha Hauer's avatar
      drm/rockchip: vop2: Fix eDP/HDMI sync polarities · 35b513a7
      Sascha Hauer authored
      The hsync/vsync polarities were not honoured for the eDP and HDMI ports.
      Add the register settings to configure the polarities as requested by the
      DRM_MODE_FLAG_PHSYNC/DRM_MODE_FLAG_PVSYNC flags.
      Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
      Fixes: 604be855 ("drm/rockchip: Add VOP2 driver")
      Tested-by: default avatarMichael Riesch <michael.riesch@wolfvision.net>
      Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
      Link: https://patchwork.freedesktop.org/patch/msgid/20220815133942.4051532-1-s.hauer@pengutronix.de
      35b513a7
    • Hans de Goede's avatar
      drm/gma500: Fix (vblank) IRQs not working after suspend/resume · 235fdbc3
      Hans de Goede authored
      Fix gnome-shell (and other page-flip users) hanging after suspend/resume
      because of the gma500's IRQs not working.
      
      This fixes 2 problems with the IRQ handling:
      
      1. gma_power_off() calls gma_irq_uninstall() which does a free_irq(), but
         gma_power_on() called gma_irq_preinstall() + gma_irq_postinstall() which
         do not call request_irq. Replace the pre- + post-install calls with
         gma_irq_install() which does prep + request + post.
      
      2. After fixing 1. IRQs still do not work on a Packard Bell Dot SC (Intel
         Atom N2600, cedarview) netbook.
      
         Cederview uses MSI interrupts and it seems that the BIOS re-configures
         things back to normal APIC based interrupts during S3 suspend. There is
         some MSI PCI-config registers save/restore code which tries to deal with
         this, but on the Packard Bell Dot SC this is not sufficient to restore
         MSI IRQ functionality after a suspend/resume.
      
         Replace the PCI-config registers save/restore with pci_disable_msi() on
         suspend + pci_enable_msi() on resume. Fixing e.g. gnome-shell hanging.
      Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
      Signed-off-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20220906203852.527663-4-hdegoede@redhat.com
      235fdbc3
    • Hans de Goede's avatar
      drm/gma500: Fix WARN_ON(lock->magic != lock) error · b6f25c3b
      Hans de Goede authored
      psb_gem_unpin() calls dma_resv_lock() but the underlying ww_mutex
      gets destroyed by drm_gem_object_release() move the
      drm_gem_object_release() call in psb_gem_free_object() to after
      the unpin to fix the below warning:
      
      [   79.693962] ------------[ cut here ]------------
      [   79.693992] DEBUG_LOCKS_WARN_ON(lock->magic != lock)
      [   79.694015] WARNING: CPU: 0 PID: 240 at kernel/locking/mutex.c:582 __ww_mutex_lock.constprop.0+0x569/0xfb0
      [   79.694052] Modules linked in: rfcomm snd_seq_dummy snd_hrtimer qrtr bnep ath9k ath9k_common ath9k_hw snd_hda_codec_realtek snd_hda_codec_generic ledtrig_audio snd_hda_codec_hdmi snd_hda_intel ath3k snd_intel_dspcfg mac80211 snd_intel_sdw_acpi btusb snd_hda_codec btrtl btbcm btintel btmtk bluetooth at24 snd_hda_core snd_hwdep uvcvideo snd_seq libarc4 videobuf2_vmalloc ath videobuf2_memops videobuf2_v4l2 videobuf2_common snd_seq_device videodev acer_wmi intel_powerclamp coretemp mc snd_pcm joydev sparse_keymap ecdh_generic pcspkr wmi_bmof cfg80211 i2c_i801 i2c_smbus snd_timer snd r8169 rfkill lpc_ich soundcore acpi_cpufreq zram rtsx_pci_sdmmc mmc_core serio_raw rtsx_pci gma500_gfx(E) video wmi ip6_tables ip_tables i2c_dev fuse
      [   79.694436] CPU: 0 PID: 240 Comm: plymouthd Tainted: G        W   E      6.0.0-rc3+ #490
      [   79.694457] Hardware name: Packard Bell dot s/SJE01_CT, BIOS V1.10 07/23/2013
      [   79.694469] RIP: 0010:__ww_mutex_lock.constprop.0+0x569/0xfb0
      [   79.694496] Code: ff 85 c0 0f 84 15 fb ff ff 8b 05 ca 3c 11 01 85 c0 0f 85 07 fb ff ff 48 c7 c6 30 cb 84 aa 48 c7 c7 a3 e1 82 aa e8 ac 29 f8 ff <0f> 0b e9 ed fa ff ff e8 5b 83 8a ff 85 c0 74 10 44 8b 0d 98 3c 11
      [   79.694513] RSP: 0018:ffffad1dc048bbe0 EFLAGS: 00010282
      [   79.694623] RAX: 0000000000000028 RBX: 0000000000000000 RCX: 0000000000000000
      [   79.694636] RDX: 0000000000000001 RSI: ffffffffaa8b0ffc RDI: 00000000ffffffff
      [   79.694650] RBP: ffffad1dc048bc80 R08: 0000000000000000 R09: ffffad1dc048ba90
      [   79.694662] R10: 0000000000000003 R11: ffffffffaad62fe8 R12: ffff9ff302103138
      [   79.694675] R13: ffff9ff306ec8000 R14: ffff9ff307779078 R15: ffff9ff3014c0270
      [   79.694690] FS:  00007ff1cccf1740(0000) GS:ffff9ff3bc200000(0000) knlGS:0000000000000000
      [   79.694705] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
      [   79.694719] CR2: 0000559ecbcb4420 CR3: 0000000013210000 CR4: 00000000000006f0
      [   79.694734] Call Trace:
      [   79.694749]  <TASK>
      [   79.694761]  ? __schedule+0x47f/0x1670
      [   79.694796]  ? psb_gem_unpin+0x27/0x1a0 [gma500_gfx]
      [   79.694830]  ? lock_is_held_type+0xe3/0x140
      [   79.694864]  ? ww_mutex_lock+0x38/0xa0
      [   79.694885]  ? __cond_resched+0x1c/0x30
      [   79.694902]  ww_mutex_lock+0x38/0xa0
      [   79.694925]  psb_gem_unpin+0x27/0x1a0 [gma500_gfx]
      [   79.694964]  psb_gem_unpin+0x199/0x1a0 [gma500_gfx]
      [   79.694996]  drm_gem_object_release_handle+0x50/0x60
      [   79.695020]  ? drm_gem_object_handle_put_unlocked+0xf0/0xf0
      [   79.695042]  idr_for_each+0x4b/0xb0
      [   79.695066]  ? _raw_spin_unlock_irqrestore+0x30/0x60
      [   79.695095]  drm_gem_release+0x1c/0x30
      [   79.695118]  drm_file_free.part.0+0x1ea/0x260
      [   79.695150]  drm_release+0x6a/0x120
      [   79.695175]  __fput+0x9f/0x260
      [   79.695203]  task_work_run+0x59/0xa0
      [   79.695227]  do_exit+0x387/0xbe0
      [   79.695250]  ? seqcount_lockdep_reader_access.constprop.0+0x82/0x90
      [   79.695275]  ? lockdep_hardirqs_on+0x7d/0x100
      [   79.695304]  do_group_exit+0x33/0xb0
      [   79.695331]  __x64_sys_exit_group+0x14/0x20
      [   79.695353]  do_syscall_64+0x58/0x80
      [   79.695376]  ? up_read+0x17/0x20
      [   79.695401]  ? lock_is_held_type+0xe3/0x140
      [   79.695429]  ? asm_exc_page_fault+0x22/0x30
      [   79.695450]  ? lockdep_hardirqs_on+0x7d/0x100
      [   79.695473]  entry_SYSCALL_64_after_hwframe+0x63/0xcd
      [   79.695493] RIP: 0033:0x7ff1ccefe3f1
      [   79.695516] Code: Unable to access opcode bytes at RIP 0x7ff1ccefe3c7.
      [   79.695607] RSP: 002b:00007ffed4413378 EFLAGS: 00000246 ORIG_RAX: 00000000000000e7
      [   79.695629] RAX: ffffffffffffffda RBX: 00007ff1cd0159e0 RCX: 00007ff1ccefe3f1
      [   79.695644] RDX: 000000000000003c RSI: 00000000000000e7 RDI: 0000000000000000
      [   79.695656] RBP: 0000000000000000 R08: ffffffffffffff80 R09: 00007ff1cd020b20
      [   79.695671] R10: 0000000000000000 R11: 0000000000000246 R12: 00007ff1cd0159e0
      [   79.695684] R13: 0000000000000000 R14: 00007ff1cd01aee8 R15: 00007ff1cd01af00
      [   79.695733]  </TASK>
      [   79.695746] irq event stamp: 725979
      [   79.695757] hardirqs last  enabled at (725979): [<ffffffffa9132d54>] finish_task_switch.isra.0+0xe4/0x3f0
      [   79.695780] hardirqs last disabled at (725978): [<ffffffffa9eb4113>] __schedule+0xdd3/0x1670
      [   79.695803] softirqs last  enabled at (725974): [<ffffffffa90fbc9d>] __irq_exit_rcu+0xed/0x160
      [   79.695825] softirqs last disabled at (725969): [<ffffffffa90fbc9d>] __irq_exit_rcu+0xed/0x160
      [   79.695845] ---[ end trace 0000000000000000 ]---
      Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
      Signed-off-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20220906203852.527663-3-hdegoede@redhat.com
      b6f25c3b
    • Hans de Goede's avatar
      drm/gma500: Fix BUG: sleeping function called from invalid context errors · 63e37a79
      Hans de Goede authored
      gma_crtc_page_flip() was holding the event_lock spinlock while calling
      crtc_funcs->mode_set_base() which takes ww_mutex.
      
      The only reason to hold event_lock is to clear gma_crtc->page_flip_event
      on mode_set_base() errors.
      
      Instead unlock it after setting gma_crtc->page_flip_event and on
      errors re-take the lock and clear gma_crtc->page_flip_event it
      it is still set.
      
      This fixes the following WARN/stacktrace:
      
      [  512.122953] BUG: sleeping function called from invalid context at kernel/locking/mutex.c:870
      [  512.123004] in_atomic(): 1, irqs_disabled(): 1, non_block: 0, pid: 1253, name: gnome-shell
      [  512.123031] preempt_count: 1, expected: 0
      [  512.123048] RCU nest depth: 0, expected: 0
      [  512.123066] INFO: lockdep is turned off.
      [  512.123080] irq event stamp: 0
      [  512.123094] hardirqs last  enabled at (0): [<0000000000000000>] 0x0
      [  512.123134] hardirqs last disabled at (0): [<ffffffff8d0ec28c>] copy_process+0x9fc/0x1de0
      [  512.123176] softirqs last  enabled at (0): [<ffffffff8d0ec28c>] copy_process+0x9fc/0x1de0
      [  512.123207] softirqs last disabled at (0): [<0000000000000000>] 0x0
      [  512.123233] Preemption disabled at:
      [  512.123241] [<0000000000000000>] 0x0
      [  512.123275] CPU: 3 PID: 1253 Comm: gnome-shell Tainted: G        W         5.19.0+ #1
      [  512.123304] Hardware name: Packard Bell dot s/SJE01_CT, BIOS V1.10 07/23/2013
      [  512.123323] Call Trace:
      [  512.123346]  <TASK>
      [  512.123370]  dump_stack_lvl+0x5b/0x77
      [  512.123412]  __might_resched.cold+0xff/0x13a
      [  512.123458]  ww_mutex_lock+0x1e/0xa0
      [  512.123495]  psb_gem_pin+0x2c/0x150 [gma500_gfx]
      [  512.123601]  gma_pipe_set_base+0x76/0x240 [gma500_gfx]
      [  512.123708]  gma_crtc_page_flip+0x95/0x130 [gma500_gfx]
      [  512.123808]  drm_mode_page_flip_ioctl+0x57d/0x5d0
      [  512.123897]  ? drm_mode_cursor2_ioctl+0x10/0x10
      [  512.123936]  drm_ioctl_kernel+0xa1/0x150
      [  512.123984]  drm_ioctl+0x21f/0x420
      [  512.124025]  ? drm_mode_cursor2_ioctl+0x10/0x10
      [  512.124070]  ? rcu_read_lock_bh_held+0xb/0x60
      [  512.124104]  ? lock_release+0x1ef/0x2d0
      [  512.124161]  __x64_sys_ioctl+0x8d/0xd0
      [  512.124203]  do_syscall_64+0x58/0x80
      [  512.124239]  ? do_syscall_64+0x67/0x80
      [  512.124267]  ? trace_hardirqs_on_prepare+0x55/0xe0
      [  512.124300]  ? do_syscall_64+0x67/0x80
      [  512.124340]  ? rcu_read_lock_sched_held+0x10/0x80
      [  512.124377]  entry_SYSCALL_64_after_hwframe+0x63/0xcd
      [  512.124411] RIP: 0033:0x7fcc4a70740f
      [  512.124442] Code: 00 48 89 44 24 18 31 c0 48 8d 44 24 60 c7 04 24 10 00 00 00 48 89 44 24 08 48 8d 44 24 20 48 89 44 24 10 b8 10 00 00 00 0f 05 <89> c2 3d 00 f0 ff ff 77 18 48 8b 44 24 18 64 48 2b 04 25 28 00 00
      [  512.124470] RSP: 002b:00007ffda73f5390 EFLAGS: 00000246 ORIG_RAX: 0000000000000010
      [  512.124503] RAX: ffffffffffffffda RBX: 000055cc9e474500 RCX: 00007fcc4a70740f
      [  512.124524] RDX: 00007ffda73f5420 RSI: 00000000c01864b0 RDI: 0000000000000009
      [  512.124544] RBP: 00007ffda73f5420 R08: 000055cc9c0b0cb0 R09: 0000000000000034
      [  512.124564] R10: 0000000000000000 R11: 0000000000000246 R12: 00000000c01864b0
      [  512.124584] R13: 0000000000000009 R14: 000055cc9df484d0 R15: 000055cc9af5d0c0
      [  512.124647]  </TASK>
      Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
      Signed-off-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20220906203852.527663-2-hdegoede@redhat.com
      63e37a79
    • Stuart Menefy's avatar
      drm/meson: Fix OSD1 RGB to YCbCr coefficient · 6463d393
      Stuart Menefy authored
      VPP_WRAP_OSD1_MATRIX_COEF22.Coeff22 is documented as being bits 0-12,
      not 16-28.
      
      Without this the output tends to have a pink hue, changing it results
      in better color accuracy.
      
      The vendor kernel doesn't use this register. However the code which
      sets VIU2_OSD1_MATRIX_COEF22 also uses bits 0-12. There is a slightly
      different style of registers for configuring some of the other matrices,
      which do use bits 16-28 for this coefficient, but those have names
      ending in MATRIX_COEF22_30, and this is not one of those.
      Signed-off-by: default avatarStuart Menefy <stuart.menefy@mathembedded.com>
      Fixes: 72888394 ("drm/meson: Add G12A Support for VIU setup")
      Reviewed-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
      Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20220908155243.687143-1-stuart.menefy@mathembedded.com
      6463d393
    • Stuart Menefy's avatar
      drm/meson: Correct OSD1 global alpha value · 6836829c
      Stuart Menefy authored
      VIU_OSD1_CTRL_STAT.GLOBAL_ALPHA is a 9 bit field, so the maximum
      value is 0x100 not 0xff.
      
      This matches the vendor kernel.
      Signed-off-by: default avatarStuart Menefy <stuart.menefy@mathembedded.com>
      Fixes: bbbe775e ("drm: Add support for Amlogic Meson Graphic Controller")
      Reviewed-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
      Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20220908155103.686904-1-stuart.menefy@mathembedded.com
      6836829c
  8. 08 Sep, 2022 3 commits
  9. 06 Sep, 2022 1 commit
  10. 02 Sep, 2022 1 commit
  11. 25 Aug, 2022 1 commit
  12. 23 Aug, 2022 1 commit
  13. 19 Aug, 2022 1 commit
  14. 18 Aug, 2022 2 commits
  15. 17 Aug, 2022 1 commit
  16. 15 Aug, 2022 2 commits
  17. 14 Aug, 2022 8 commits
    • Linus Torvalds's avatar
      Linux 6.0-rc1 · 568035b0
      Linus Torvalds authored
      568035b0
    • Yury Norov's avatar
      radix-tree: replace gfp.h inclusion with gfp_types.h · 9f162193
      Yury Norov authored
      Radix tree header includes gfp.h for __GFP_BITS_SHIFT only. Now we
      have gfp_types.h for this.
      
      Fixes powerpc allmodconfig build:
      
         In file included from include/linux/nodemask.h:97,
                          from include/linux/mmzone.h:17,
                          from include/linux/gfp.h:7,
                          from include/linux/radix-tree.h:12,
                          from include/linux/idr.h:15,
                          from include/linux/kernfs.h:12,
                          from include/linux/sysfs.h:16,
                          from include/linux/kobject.h:20,
                          from include/linux/pci.h:35,
                          from arch/powerpc/kernel/prom_init.c:24:
         include/linux/random.h: In function 'add_latent_entropy':
      >> include/linux/random.h:25:46: error: 'latent_entropy' undeclared (first use in this function); did you mean 'add_latent_entropy'?
            25 |         add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
               |                                              ^~~~~~~~~~~~~~
               |                                              add_latent_entropy
         include/linux/random.h:25:46: note: each undeclared identifier is reported only once for each function it appears in
      Reported-by: default avatarkernel test robot <lkp@intel.com>
      CC: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
      CC: Andrew Morton <akpm@linux-foundation.org>
      CC: Jason A. Donenfeld <Jason@zx2c4.com>
      Signed-off-by: default avatarYury Norov <yury.norov@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9f162193
    • Linus Torvalds's avatar
      Merge tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 74cbb480
      Linus Torvalds authored
      Pull vfs lseek fix from Al Viro:
       "Fix proc_reg_llseek() breakage. Always had been possible if somebody
        left NULL ->proc_lseek, became a practical issue now"
      
      * tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        take care to handle NULL ->proc_lseek()
      74cbb480
    • Al Viro's avatar
      take care to handle NULL ->proc_lseek() · 3f61631d
      Al Viro authored
      Easily done now, just by clearing FMODE_LSEEK in ->f_mode
      during proc_reg_open() for such entries.
      
      Fixes: 868941b1 "fs: remove no_llseek"
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      3f61631d
    • Linus Torvalds's avatar
      Merge tag 'for-linus-6.0-rc1b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 5d6a0f4d
      Linus Torvalds authored
      Pull more xen updates from Juergen Gross:
      
       - fix the handling of the "persistent grants" feature negotiation
         between Xen blkfront and Xen blkback drivers
      
       - a cleanup of xen.config and adding xen.config to Xen section in
         MAINTAINERS
      
       - support HVMOP_set_evtchn_upcall_vector, which is more compliant to
         "normal" interrupt handling than the global callback used up to now
      
       - further small cleanups
      
      * tag 'for-linus-6.0-rc1b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        MAINTAINERS: add xen config fragments to XEN HYPERVISOR sections
        xen: remove XEN_SCRUB_PAGES in xen.config
        xen/pciback: Fix comment typo
        xen/xenbus: fix return type in xenbus_file_read()
        xen-blkfront: Apply 'feature_persistent' parameter when connect
        xen-blkback: Apply 'feature_persistent' parameter when connect
        xen-blkback: fix persistent grants negotiation
        x86/xen: Add support for HVMOP_set_evtchn_upcall_vector
      5d6a0f4d
    • Linus Torvalds's avatar
      Merge tag 'perf-tools-fixes-for-v6.0-2022-08-13' of... · 96f86ff0
      Linus Torvalds authored
      Merge tag 'perf-tools-fixes-for-v6.0-2022-08-13' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux
      
      Pull more perf tool updates from Arnaldo Carvalho de Melo:
      
       - 'perf c2c' now supports ARM64, adjust its output to cope with
         differences with what is in x86_64. Now go find false sharing on
         ARM64 (at least Neoverse) as well!
      
       - Refactor the JSON processing, making the output more compact and thus
         reducing the size of the resulting perf binary
      
       - Improvements for 'perf offcpu' profiling, including tracking child
         processes
      
       - Update Intel JSON metrics and events files for broadwellde,
         broadwellx, cascadelakex, haswellx, icelakex, ivytown, jaketown,
         knightslanding, sapphirerapids, skylakex and snowridgex
      
       - Add 'perf stat' JSON output and a 'perf test' entry for it
      
       - Ignore memfd and anonymous mmap events if jitdump present
      
       - Refactor 'perf test' shell tests allowing subdirs
      
       - Fix an error handling path in 'parse_perf_probe_command()'
      
       - Fixes for the guest Intel PT tracing patchkit in the 1st batch of
         this merge window
      
       - Print debuginfod queries if -v option is used, to explain delays in
         processing when debuginfo servers are enabled to fetch DSOs with
         richer symbol tables
      
       - Improve error message for 'perf record -p not_existing_pid'
      
       - Fix openssl and libbpf feature detection
      
       - Add PMU pai_crypto event description for IBM z16 on 'perf list'
      
       - Fix typos and duplicated words on comments in various places
      
      * tag 'perf-tools-fixes-for-v6.0-2022-08-13' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux: (81 commits)
        perf test: Refactor shell tests allowing subdirs
        perf vendor events: Update events for snowridgex
        perf vendor events: Update events and metrics for skylakex
        perf vendor events: Update metrics for sapphirerapids
        perf vendor events: Update events for knightslanding
        perf vendor events: Update metrics for jaketown
        perf vendor events: Update metrics for ivytown
        perf vendor events: Update events and metrics for icelakex
        perf vendor events: Update events and metrics for haswellx
        perf vendor events: Update events and metrics for cascadelakex
        perf vendor events: Update events and metrics for broadwellx
        perf vendor events: Update metrics for broadwellde
        perf jevents: Fold strings optimization
        perf jevents: Compress the pmu_events_table
        perf metrics: Copy entire pmu_event in find metric
        perf pmu-events: Hide the pmu_events
        perf pmu-events: Don't assume pmu_event is an array
        perf pmu-events: Move test events/metrics to JSON
        perf test: Use full metric resolution
        perf pmu-events: Hide pmu_events_map
        ...
      96f86ff0
    • Linus Torvalds's avatar
      Merge tag 'powerpc-6.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · d785610f
      Linus Torvalds authored
      Pull powerpc fixes from Michael Ellerman:
      
       - Ensure we never emit lwarx with EH=1 on 32-bit, because some 32-bit
         CPUs trap on it rather than ignoring it as they should.
      
       - Fix ftrace when building with clang, which was broken by some
         refactoring.
      
       - A couple of other minor fixes.
      
      Thanks to Christophe Leroy, Naveen N.  Rao, Nick Desaulniers, Ondrej
      Mosnacek, Pali Rohár, Russell Currey, and Segher Boessenkool.
      
      * tag 'powerpc-6.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
        powerpc/kexec: Fix build failure from uninitialised variable
        powerpc/ppc-opcode: Fix PPC_RAW_TW()
        powerpc64/ftrace: Fix ftrace for clang builds
        powerpc: Make eh value more explicit when using lwarx
        powerpc: Don't hide eh field of lwarx behind a macro
        powerpc: Fix eh field when calling lwarx on PPC32
      d785610f
    • Linus Torvalds's avatar
      Merge tag 'pull-work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · aea23e7c
      Linus Torvalds authored
      Pull /proc/mounts fix from Al Viro:
       "Fix for /proc/mounts escaping - escape the '#' character too"
      
      * tag 'pull-work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        vfs: escape hash as well
      aea23e7c