Hi all,
On Wed, 17 Feb 2021 16:07:14 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/x86/platform/intel-mid/device_libs/platform_bt.c
>
> between commit:
>
> 4590d98f5a4f ("sfi: Remove framework for deprecated firmware")
>
> from the
On Wed, Feb 17, 2021 at 7:38 AM Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/x86/platform/intel-mid/device_libs/platform_bt.c
>
> between commit:
>
> 4590d98f5a4f ("sfi: Remove framework for deprecated firmware")
>
> from the pm t
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/platform/intel-mid/device_libs/platform_bt.c
between commit:
4590d98f5a4f ("sfi: Remove framework for deprecated firmware")
from the pm tree and commit:
bdb154f074a6 ("x86/platform/intel-mid: Convert comma to s
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/Kconfig
between commit:
139d7deeea00 ("[elfcore-compat][amd64] clean PRSTATUS_SIZE/SET_PR_FPVALID up
properly")
from the vfs tree and commit:
2ca408d9c749 ("fanotify: Fix sys_fanotify_mark() on native x86-32")
fr
Hi Stephen,
On 16. 12. 20 2:00, Stephen Rothwell wrote:
> Hi all,
>
> On Thu, 10 Dec 2020 15:03:23 +0100 Michal Simek wrote:
>>
>> On 10. 12. 20 5:58, Stephen Rothwell wrote:
>>>
>>> Today's linux-next merge of the tip tree got conflicts in:
>>>
>>> arch/microblaze/Kconfig
>>> arch/microblaz
Hi all,
On Thu, 10 Dec 2020 15:03:23 +0100 Michal Simek wrote:
>
> On 10. 12. 20 5:58, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the tip tree got conflicts in:
> >
> > arch/microblaze/Kconfig
> > arch/microblaze/mm/Makefile
> >
> > between commit:
> >
> > 05cdf457477d
Hi Stephen,
On 10. 12. 20 5:58, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got conflicts in:
>
> arch/microblaze/Kconfig
> arch/microblaze/mm/Makefile
>
> between commit:
>
> 05cdf457477d ("microblaze: Remove noMMU code")
>
> from the microblaze tree
Hi all,
Today's linux-next merge of the tip tree got conflicts in:
arch/microblaze/Kconfig
arch/microblaze/mm/Makefile
between commit:
05cdf457477d ("microblaze: Remove noMMU code")
from the microblaze tree and commit:
7ac1b26b0a72 ("microblaze/mm/highmem: Switch to generic kmap atomi
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
Documentation/x86/index.rst
between commit:
ed13a92d0fde ("docs: archis: add a per-architecture features list")
from the jc_docs tree and commit:
3fa97bf00126 ("Documentation/x86: Document SGX kernel architecture")
fro
On 11/22/20 7:42 PM, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
tools/power/cpupower/utils/helpers/misc.c
between commit:
748f0d70087c ("cpupower: Provide online and offline CPU information")
from the cpupower tree and commit:
8113ab
On Mon, Nov 30, 2020 at 11:21:20AM +0100, Borislav Petkov wrote:
> On Mon, Nov 30, 2020 at 03:03:36PM +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the tip tree got a conflict in:
> >
> > arch/x86/pci/i386.c
> >
> > between commit:
> >
> > ace091d17272 ("x86
On Mon, Nov 30, 2020 at 03:03:36PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/x86/pci/i386.c
>
> between commit:
>
> ace091d17272 ("x86/PCI: Fix kernel-doc markup")
>
> from the pci tree and commit:
>
> 638920a66a17
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/pci/i386.c
between commit:
ace091d17272 ("x86/PCI: Fix kernel-doc markup")
from the pci tree and commit:
638920a66a17 ("x86/PCI: Make a kernel-doc comment a normal one")
from the tip tree.
I fixed it up (I ju
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
tools/power/cpupower/utils/helpers/misc.c
between commit:
748f0d70087c ("cpupower: Provide online and offline CPU information")
from the cpupower tree and commit:
8113ab20e850 ("tools/power/cpupower: Read energy_perf_bi
On 11/9/20 6:45 AM, Thomas Gleixner wrote:
> On Mon, Nov 09 2020 at 14:14, Stephen Rothwell wrote:
>> Today's linux-next merge of the tip tree got a conflict in:
>>
>> include/linux/sched/signal.h
>> include/linux/tracehook.h
>> kernel/signal.c
>> kernel/task_work.c
>>
>> between commits:
>
On Mon, Nov 09 2020 at 14:14, Stephen Rothwell wrote:
> Today's linux-next merge of the tip tree got a conflict in:
>
> include/linux/sched/signal.h
> include/linux/tracehook.h
> kernel/signal.c
> kernel/task_work.c
>
> between commits:
>
> fdb5f027ce66 ("task_work: use TIF_NOTIFY_SIGNAL
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
include/linux/sched/signal.h
include/linux/tracehook.h
kernel/signal.c
kernel/task_work.c
between commits:
fdb5f027ce66 ("task_work: use TIF_NOTIFY_SIGNAL if available")
bf6996650675 ("task_work: remove legacy TWA_S
On Fri, 6 Nov 2020 13:39:02 +1100
Stephen Rothwell wrote:
> I fixed it up (the latter removed the code updated by the former, so I
> just used the latter) 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
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
kernel/kprobes.c
between commit:
645f224e7ba2 ("kprobes: Tell lockdep about kprobe nesting")
from Linus' tree and commits:
d741bf41d7c7 ("kprobes: Remove kretprobe hash")
6e426e0fcd20 ("kprobes: Replace rp->free_insta
Hi all,
On Tue, 6 Oct 2020 17:11:35 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/x86/kernel/setup.c
>
> between commit:
>
> f47e22d65d08 ("dma-mapping: split ")
>
> from the dma-mapping tree and commit:
>
> a945c8345ec0 ("stat
Hi all,
On Fri, 25 Sep 2020 15:25:45 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/arm/Makefile
>
> between commit:
>
> 596b0474d3d9 ("kbuild: preprocess module linker script")
>
> from the kbuild tree and commit:
>
> 5a17850e2
Hi all,
On Mon, 12 Oct 2020 15:15:27 +1100 Stephen Rothwell
wrote:
>
> On Wed, 23 Sep 2020 15:13:36 +1000 Stephen Rothwell
> wrote:
> >
> > Today's linux-next merge of the tip tree got a conflict in:
> >
> > drivers/gpu/drm/amd/amdkfd/kfd_priv.h
> >
> > between commit:
> >
> > 59d7115d
Hi all,
On Fri, 2 Oct 2020 15:22:24 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> include/linux/iommu.h
>
> between commits:
>
> 23cc3493b5e1 ("iommu/uapi: Rename uapi functions")
> d90573812eea ("iommu/uapi: Handle data and argsz fill
Hi all,
On Fri, 25 Sep 2020 15:35:10 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/x86/kernel/apic/msi.c
>
> between commit:
>
> 2705b8e4d46f ("x86/apic/msi: Use Real PCI DMA device when configuring IRTE")
>
> from the pci tree and
Hi all,
On Fri, 25 Sep 2020 15:21:18 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/pci/controller/vmd.c
>
> between commit:
>
> 42443f036042 ("PCI: vmd: Create IRQ Domain configuration helper")
>
> from the pci tree and commit:
Hi all,
On Wed, 23 Sep 2020 15:13:36 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/gpu/drm/amd/amdkfd/kfd_priv.h
>
> between commit:
>
> 59d7115dae02 ("drm/amdkfd: Move process doorbell allocation into kfd
> device")
>
> from t
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/kernel/setup.c
between commit:
f47e22d65d08 ("dma-mapping: split ")
from the dma-mapping tree and commit:
a945c8345ec0 ("static_call: Allow early init")
from the tip tree.
I fixed it up (see below) and can ca
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
include/linux/iommu.h
between commits:
23cc3493b5e1 ("iommu/uapi: Rename uapi functions")
d90573812eea ("iommu/uapi: Handle data and argsz filled by users")
from the iommu tree and commit:
c7b6bac9c72c ("drm, iommu: C
On Thu, Oct 01, 2020 at 04:38:27PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/x86/pci/xen.c
>
> between commit:
>
> b0623566c2e9 ("x86/xen: Fix xen_msi_init() missing prototype warning")
I dropped this from my tree, tha
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/pci/xen.c
between commit:
b0623566c2e9 ("x86/xen: Fix xen_msi_init() missing prototype warning")
from the pci tree and commit:
2905c50b7d3e ("x86/xen: Make xen_msi_init() static and rename it to
xen_hvm_msi_in
Hi all,
Today's linux-next merge of the tip tree got conflicts in:
arch/ia64/Kconfig
arch/s390/Kconfig
between commit:
5e6e9852d6f7 ("uaccess: add infrastructure for kernel builds with set_fs()")
from the vfs tree and commit:
077ee78e3928 ("PCI/MSI: Make arch_.*_msi_irq[s] fallbacks s
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/kernel/apic/msi.c
between commit:
2705b8e4d46f ("x86/apic/msi: Use Real PCI DMA device when configuring IRTE")
from the pci tree and commit:
7ca435cf857d ("x86/irq: Cleanup the arch_*_msi_irqs() leftovers")
fr
Hi all,
Today's linux-next merge of the tip tree got conflicts in:
arch/ia64/Kconfig
arch/s390/Kconfig
between commit:
5e6e9852d6f7 ("uaccess: add infrastructure for kernel builds with set_fs()")
from the vfs tree and commit:
077ee78e3928 ("PCI/MSI: Make arch_.*_msi_irq[s] fallbacks s
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/arm/Makefile
between commit:
596b0474d3d9 ("kbuild: preprocess module linker script")
from the kbuild tree and commit:
5a17850e251a ("arm/build: Warn on orphan section placement")
from the tip tree.
I fixed it up
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/pci/controller/vmd.c
between commit:
42443f036042 ("PCI: vmd: Create IRQ Domain configuration helper")
from the pci tree and commit:
585dfe8abc44 ("PCI: vmd: Dont abuse vector irqomain as parent")
from the tip
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/gpu/drm/amd/amdkfd/kfd_priv.h
between commit:
59d7115dae02 ("drm/amdkfd: Move process doorbell allocation into kfd device")
from the amdgpu tree and commit:
c7b6bac9c72c ("drm, iommu: Change type of pasid to u32
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
kernel/time/timekeeping.c
between commit:
025e82bcbc34 ("timekeeping: Use sequence counter with associated raw
spinlock")
from Linus' tree and commit:
19d0070a2792 ("timekeeping/vsyscall: Provide vdso_update_begin/end(
Hi all,
On Mon, 27 Jul 2020 15:35:10 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/x86/include/asm/fpu/xstate.h
>
> between commit:
>
> c196049cc732 ("x86: switch to ->regset_get()")
>
> from the vfs tree and commit:
>
> ce711e
Hi all,
On Tue, 21 Jul 2020 14:28:45 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/x86/include/asm/inst.h
>
> between commit:
>
> d7866e503bdc ("crypto: x86 - Remove include/asm/inst.h")
> (also "crypto: x86 - Put back integer parts
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/gpu/drm/msm/msm_drv.c
between commit:
00be2abf1413 ("drm/msm: use kthread_create_worker instead of kthread_run")
from the drm-msm tree and commits:
64419ca67622 ("sched,msm: Convert to sched_set_fifo*()")
8b70
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/include/asm/fpu/xstate.h
between commit:
c196049cc732 ("x86: switch to ->regset_get()")
from the vfs tree and commit:
ce711ea3cab9 ("perf/x86/intel/lbr: Support XSAVES/XRSTORS for LBR context
switch")
from th
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/include/asm/inst.h
between commit:
d7866e503bdc ("crypto: x86 - Remove include/asm/inst.h")
(also "crypto: x86 - Put back integer parts of include/asm/inst.h"
which I have added to the crypto tree merge today)
fro
On Fri, Jul 17, 2020 at 09:31:18AM +0200, Uros Bizjak wrote:
> Please find attached the incremental patch that puts back integer
> parts of inst.h. This resolves the conflict with the tip tree.
Sorry but you can't send a patch without changing the Subject line
as otherwise patchwork will simply tr
Hi Uros,
On Mon, 20 Jul 2020 08:13:51 +0200 Uros Bizjak wrote:
>
> On Mon, Jul 20, 2020 at 6:03 AM Stephen Rothwell
> wrote:
>
> > > Please find attached the incremental patch that puts back integer
> > > parts of inst.h. This resolves the conflict with the tip tree.
> >
> > The tip tree cha
On Mon, Jul 20, 2020 at 6:03 AM Stephen Rothwell wrote:
> > Please find attached the incremental patch that puts back integer
> > parts of inst.h. This resolves the conflict with the tip tree.
>
> The tip tree change needs the XMM parts kept as well, sorry.
Strange, because I did test my patch w
Hi Uros,
On Fri, 17 Jul 2020 09:31:18 +0200 Uros Bizjak wrote:
>
> Please find attached the incremental patch that puts back integer
> parts of inst.h. This resolves the conflict with the tip tree.
The tip tree change needs the XMM parts kept as well, sorry.
So I ended up just removing the actu
Please find attached the incremental patch that puts back integer
parts of inst.h. This resolves the conflict with the tip tree.
Uros.
On Fri, Jul 17, 2020 at 8:45 AM Herbert Xu wrote:
>
> On Fri, Jul 17, 2020 at 08:27:27AM +0200, Uros Bizjak wrote:
> >
> > I will prepare a v2 that leaves needed
Hi Herbert,
On Fri, 17 Jul 2020 16:44:01 +1000 Herbert Xu
wrote:
>
> On Fri, Jul 17, 2020 at 08:27:27AM +0200, Uros Bizjak wrote:
> >
> > I will prepare a v2 that leaves needed part of inst.h.
>
> Your patch has already been applied. So please make it an
> incremental patch.
Thank you both.
On Fri, Jul 17, 2020 at 08:27:27AM +0200, Uros Bizjak wrote:
>
> I will prepare a v2 that leaves needed part of inst.h.
Your patch has already been applied. So please make it an
incremental patch.
Thanks,
--
Email: Herbert Xu
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gond
On Fri, Jul 17, 2020 at 6:47 AM Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/x86/include/asm/inst.h
>
> between commit:
>
> d7866e503bdc ("crypto: x86 - Remove include/asm/inst.h")
>
> from the crypto tree and commit:
>
> eaad98
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/include/asm/inst.h
between commit:
d7866e503bdc ("crypto: x86 - Remove include/asm/inst.h")
from the crypto tree and commit:
eaad981291ee ("x86/entry/64: Introduce the FIND_PERCPU_BASE macro")
from the tip tre
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/spi/spi.c
between commit:
60a883d119ab ("spi: use kthread_create_worker() helper")
from the spi tree and commit:
3070da33400c ("sched,spi: Convert to sched_set_fifo*()")
from the tip tree.
I fixed it up (see b
Hi Thomas,
On Thu, 11 Jun 2020 12:43:24 +0200 Thomas Gleixner wrote:
>
> Sorry for that inconveniance. I'm about to get rid of the conflicts on
> the tip side.
Thanks. I do realise that it can take a little while between when
Linus adds something to his tree and previous versions get purged. I
Stephen Rothwell writes:
> Today's linux-next merge of the tip tree got conflicts in:
>
> include/linux/compiler.h
>
> between commits:
>
> dee081bf8f82 ("READ_ONCE: Drop pointer qualifiers when reading from scalar
> types")
> 9e343b467c70 ("READ_ONCE: Enforce atomicity for {READ,WRITE}_ONC
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
include/linux/compiler_types.h
between commits:
a5dead405f6b ("compiler_types.h: Optimize __unqual_scalar_typeof compilation
time")
from Linus' tree and commits:
1fd76043ecb0 ("compiler_types.h: Optimize __unqual_scala
Hi all,
Today's linux-next merge of the tip tree got conflicts in:
include/linux/compiler.h
between commits:
dee081bf8f82 ("READ_ONCE: Drop pointer qualifiers when reading from scalar
types")
9e343b467c70 ("READ_ONCE: Enforce atomicity for {READ,WRITE}_ONCE() memory
accesses")
a5460b5
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/sparc/include/asm/pgtable_32.h
because commits
3408974d0533 ("sparc32: mm: Restructure sparc32 MMU page-table layout")
c95be5b549d6 ("sparc32: mm: Change pgtable_t type to pte_t * instead of
struct page *")
from th
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
Documentation/admin-guide/hw-vuln/index.rst
between commit:
7222a1b5b874 ("x86/speculation: Add SRBDS vulnerability and mitigation
documentation")
from Linus' tree and commit:
0fcfdf55db9e ("Documentation: Add L1D flus
Hi all,
Today's linux-next merge of the tip tree got conflicts in:
arch/sparc/mm/srmmu.c
Commits
3408974d0533 sparc32: mm: Restructure sparc32 MMU page-table layout
c95be5b549d6 sparc32: mm: Change pgtable_t type to pte_t * instead of struct
page *
f790d0205fd5 sparc32: mm: Fix argument chec
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/firmware/efi/libstub/arm32-stub.c
between commit:
d0f9ca9be11f ("ARM: decompressor: run decompressor in place if loaded via
UEFI")
from the arm tree and commit:
793473c28a4b ("efi/libstub: Move pr_efi/pr_efi_er
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
kernel/Makefile
between commit:
d08b9f0ca660 ("scs: Add support for Clang's Shadow Call Stack (SCS)")
from the arm64 tree and commit:
dfd402a4c4ba ("kcsan: Add Kernel Concurrency Sanitizer infrastructure")
from the tip
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/gpu/drm/drm_dp_mst_topology.c
between commit:
a4292e52106b ("drm: Match drm_dp_send_clear_payload_id_table definition to
declaration")
from the drm-misc tree and commit:
53965dbe5396 ("drm: Make drm_dp_mst_dsc_
On Mon, May 18, 2020 at 03:10:32PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> include/linux/compiler.h
>
> between commit:
>
> a9a3ed1eff36 ("x86: Fix early boot crash on gcc-10, third try")
>
> from Linus' tree and commit:
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
include/linux/compiler.h
between commit:
a9a3ed1eff36 ("x86: Fix early boot crash on gcc-10, third try")
from Linus' tree and commit:
f670269a42bf ("x86: Fix early boot crash on gcc-10, next try")
from the tip tree.
I
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
samples/bpf/Makefile
between commit:
1d97c6c2511f ("samples/bpf: Base target programs rules on Makefile.target")
from the net-next tree and commit:
fce9501aec6b ("samples/bpf: fix build by setting HAVE_ATTR_TEST to zero
On Fri, Oct 18, 2019 at 01:31:39PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> samples/bpf/Makefile
>
> between commit:
>
> 1d97c6c2511f ("samples/bpf: Base target programs rules on Makefile.target")
>
> from the net-next tre
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
net/core/sock.c
between commit:
8265792bf887 ("net: silence KCSAN warnings around sk_add_backlog() calls")
from the net tree and commit:
5facae4f3549 ("locking/lockdep: Remove unused @nested argument from
lock_release(
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/ia64/Kconfig
between commits:
fc5bad03709f9 ("ia64: remove the hpsim platform")
cf07cb1ff4ea0 ("ia64: remove support for the SGI SN2 platform")
from the ia64 tree and commit:
a2cbfd46559e8 ("arch, ia64: Make NUMA
* Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> tools/power/x86/turbostat/turbostat.c
>
> between commit:
>
> cd188af5282d ("tools/power turbostat: Fix Haswell Core systems")
> b62b3184576b ("tools/power turbostat: add Jacobsvill
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
tools/power/x86/turbostat/turbostat.c
between commit:
cd188af5282d ("tools/power turbostat: Fix Haswell Core systems")
b62b3184576b ("tools/power turbostat: add Jacobsville support")
d93ea567fc4e ("tools/power turbostat
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/ia64/include/asm/sn/sn_sal.h
between commit:
cf07cb1ff4ea ("ia64: remove support for the SGI SN2 platform")
from the ia64 tree and commit:
5828efb95bc4 ("efi: ia64: move SAL systab handling out of generic EFI code"
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/include/uapi/asm/types.h
between commit:
d9c525229521 ("treewide: add "WITH Linux-syscall-note" to SPDX tag of uapi
headers")
from Linus' tree and commit:
701010532164 ("x86/build: Remove unneeded uapi asm-gen
On 7/8/19 5:17 PM, Stephen Rothwell wrote:
Hi all,
On Mon, 1 Jul 2019 17:15:24 +1000 Stephen Rothwell
wrote:
Today's linux-next merge of the tip tree got a conflict in:
drivers/hwmon/coretemp.c
between commit:
601fdf7e6635 ("hwmon: Correct struct allocation style")
from the hwmon-s
Hi all,
On Mon, 1 Jul 2019 17:15:24 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/hwmon/coretemp.c
>
> between commit:
>
> 601fdf7e6635 ("hwmon: Correct struct allocation style")
>
> from the hwmon-staging tree and commit:
>
>
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/hwmon/coretemp.c
between commit:
601fdf7e6635 ("hwmon: Correct struct allocation style")
from the hwmon-staging tree and commit:
835896a59b95 ("hwmon/coretemp: Cosmetic: Rename internal variables to zones
from
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/s390/kernel/stacktrace.c
between commit:
78c98f907413 ("s390/unwind: introduce stack unwind API")
from the s390 tree and commit:
6a28b4c2d93b ("s390/stacktrace: Remove the pointless ULONG_MAX marker")
from the tip
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/arm64/include/asm/Kbuild
between commit:
c67fdc1f00cb ("arch: mostly remove ")
from the asm-generic tree and commit:
46ad0840b158 ("locking/rwsem: Remove arch specific rwsem files")
from the tip tree.
I fixed it
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/kernel/irq_64.c
between commit:
d75f773c86a2 ("treewide: Switch printk users from %pf and %pF to %ps and %pS,
respectively")
from the printk tree and commit:
117ed4548541 ("x86/irq/64: Remove stack overflow de
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
mm/kasan/Makefile
between commit:
e2092740b723 ("kasan: Makefile: Replace -pg with CC_FLAGS_FTRACE")
from the arm64 tree and commit:
57b78a62e7f2 ("x86/uaccess, kasan: Fix KASAN vs SMAP")
from the tip tree.
I fixed it
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/s390/include/asm/Kbuild
between commit:
fdcd06a8ab77 ("arch: Use asm-generic header for asm/mmiowb.h")
from the arm64 tree and commit:
46ad0840b158 ("locking/rwsem: Remove arch specific rwsem files")
from the tip
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/um/Kconfig
between commit:
eac616557050 ("x86: Deprecate a.out support")
from Linus' tree and commit:
942fa985e9f1 ("32-bit userspace ABI: introduce ARCH_32BIT_OFF_T config
option")
from the tip tree.
I fixe
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
Kbuild
between commits:
86948e2a69de ("scripts/gdb: delay generation of gdb constants.py")
f4d5577af6d3 ("kbuild: remove unimportant comments from ./Kbuild")
from the kbuild tree and commit:
8d32588077bd ("locking/ato
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
include/uapi/linux/time.h
between commits:
bcb3fc3247e5 ("arch: sparc: Override struct __kernel_old_timeval")
ca5e9aba753e ("time: Add time_types.h")
from the net-next tree and commit:
c70a772fda11 ("y2038: remove str
Hi all,
Today's linux-next merge of the tip tree got conflicts in:
arch/x86/entry/syscalls/syscall_32.tbl
arch/x86/entry/syscalls/syscall_64.tbl
include/uapi/asm-generic/unistd.h
between commits:
1690d3ffa284 ("Add io_uring IO interface")
0e5d5b5a94c8 ("io_uring: add support for pre-m
Hi all,
On Mon, 26 Nov 2018 15:39:25 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/x86/kernel/cpu/resctrl/rdtgroup.c
>
> between commit:
>
> 16ec1a5d58ea ("kernfs, sysfs, cgroup, intel_rdt: Support fs_context")
> (where the file is
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
Makefile
between commits:
65bba0423ecf ("kbuild: fix UML build error with CONFIG_GCC_PLUGINS")
059bc9fc375e ("kbuild: make 'archprepare' depend on 'scripts'")
ce2fd53a10c7 ("kbuild: descend into scripts/gcc-plugins/ via
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/hwmon/k10temp.c
between commit:
c552e29fdd63 ("hwmon: (k10temp) Add Hygon Dhyana support")
from the hwmon-staging tree and commit:
210ba1201ff9 ("hwmon/k10temp: Add support for AMD family 17h, model 30h CPUs")
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/kernel/cpu/resctrl/rdtgroup.c
between commit:
16ec1a5d58ea ("kernfs, sysfs, cgroup, intel_rdt: Support fs_context")
(where the file is arch/x86/kernel/cpu/intel_rdt_rdtgroup.c)
from the vfs tree and commit:
580
On Fri, Oct 12, 2018 at 3:47 AM, Ingo Molnar wrote:
>
> * Kees Cook wrote:
>
>> On Thu, Oct 11, 2018 at 7:14 PM, Stephen Rothwell
>> wrote:
>> > Hi all,
>> >
>> > Today's linux-next merge of the tip tree got a conflict in:
>> >
>> > arch/x86/mm/pgtable.c
>> >
>> > between commit:
>> >
>> >
* Kees Cook wrote:
> On Thu, Oct 11, 2018 at 7:14 PM, Stephen Rothwell
> wrote:
> > Hi all,
> >
> > Today's linux-next merge of the tip tree got a conflict in:
> >
> > arch/x86/mm/pgtable.c
> >
> > between commit:
> >
> > 184d47f0fd36 ("x86/mm: Avoid VLA in pgd_alloc()")
> >
> > from Linu
On Thu, Oct 11, 2018 at 7:14 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/x86/mm/pgtable.c
>
> between commit:
>
> 184d47f0fd36 ("x86/mm: Avoid VLA in pgd_alloc()")
>
> from Linus' tree and commit:
>
> 1be3f247c288 ("x86/mm: A
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/mm/pgtable.c
between commit:
184d47f0fd36 ("x86/mm: Avoid VLA in pgd_alloc()")
from Linus' tree and commit:
1be3f247c288 ("x86/mm: Avoid VLA in pgd_alloc()")
from the tip tree.
I fixed it up (I used the versi
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/s390/Kconfig
between commit:
819eafaa7b58 ("s390/kasan: add initialization code and enable it")
from the s290 tree and commit:
13ddb52c165b ("s390/jump_label: Switch to relative references")
from the tip tree.
I
On Mon, Oct 08, 2018 at 12:05:02PM +0200, Rafael J. Wysocki wrote:
> On Monday, October 8, 2018 4:40:20 AM CEST Stephen Rothwell wrote:
> >
> > --Sig_/8A/3tsSoWQOAryCmuI_nxw6
> > Content-Type: text/plain; charset=US-ASCII
> > Content-Transfer-Encoding: quoted-printable
> >
> > Hi all,
> >
> > To
On Mon, Oct 8, 2018 at 1:11 PM Rafael J. Wysocki wrote:
>
> On Monday, October 8, 2018 4:44:49 AM CEST Stephen Rothwell wrote:
> >
> > --Sig_/bNRy8ryxcqLmcoGqvlETGhp
> > Content-Type: text/plain; charset=US-ASCII
> > Content-Transfer-Encoding: quoted-printable
> >
> > Hi all,
> >
> > Today's linux
On Monday, October 8, 2018 4:44:49 AM CEST Stephen Rothwell wrote:
>
> --Sig_/bNRy8ryxcqLmcoGqvlETGhp
> Content-Type: text/plain; charset=US-ASCII
> Content-Transfer-Encoding: quoted-printable
>
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/powercap/int
On Monday, October 8, 2018 4:40:20 AM CEST Stephen Rothwell wrote:
>
> --Sig_/8A/3tsSoWQOAryCmuI_nxw6
> Content-Type: text/plain; charset=US-ASCII
> Content-Transfer-Encoding: quoted-printable
>
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/idle/intel_i
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/powercap/intel_rapl.c
between commit:
17ed15183c24 ("powercap: RAPL: Get rid of custom RAPL_CPU() macro")
from the pm tree and commit:
f2c4db1bd807 ("x86/cpu: Sanitize FAM6_ATOM naming")
from the tip tree.
I f
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/idle/intel_idle.c
between commit:
a4a008e53c9e ("intel_idle: Get rid of custom ICPU() macro")
from the pm tree and commit:
f2c4db1bd807 ("x86/cpu: Sanitize FAM6_ATOM naming")
from the tip tree.
I fixed it up (
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
MAINTAINERS
between commits:
81aa283c6924 ("MAINTAINERS: Add Actions Semi S900 clk entries")
677309b0e9e6 ("MAINTAINERS: Add entry for Actions Semi Owl SoCs DMA driver")
from the arm-soc tree and commit:
9d8d47ea6ec6
1 - 100 of 458 matches
Mail list logo
