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 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
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
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
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,
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
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,
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
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 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
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:
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
* 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
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,
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
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
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,
On Mon, 6 Aug 2018 14:53:31 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/infiniband/core/rdma_core.c
>
> between commit:
>
> 9867f5c6695f ("IB/uverbs: Convert 'bool exclusive' into an enum")
>
> from the rdma tree and c
Hi all,
On Mon, 6 Aug 2018 14:47:36 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got conflicts in:
>
> arch/arm64/Kconfig
> arch/openrisc/Kconfig
>
> between commit:
>
> 1572497cb0e6 ("kconfig: include common Kconfig files from top-level
> Kconfig")
>
> f
On Mon, Aug 06, 2018 at 02:53:31PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/infiniband/core/rdma_core.c
>
> between commit:
>
> 9867f5c6695f ("IB/uverbs: Convert 'bool exclusive' into an enum")
>
> from the rdma tr
On Fri, 22 Jun 2018, Reinette Chatre wrote:
> On 6/22/2018 6:39 AM, Thomas Gleixner wrote:
> > On Fri, 22 Jun 2018, Al Viro wrote:
> >> On Fri, Jun 22, 2018 at 01:45:23PM +0100, David Howells wrote:
> >>> Reinette Chatre wrote:
> >>>
> Thomas and David, please let me know what I can do from m
Hi Thomas,
On 6/22/2018 6:39 AM, Thomas Gleixner wrote:
> On Fri, 22 Jun 2018, Al Viro wrote:
>> On Fri, Jun 22, 2018 at 01:45:23PM +0100, David Howells wrote:
>>> Reinette Chatre wrote:
>>>
Thomas and David, please let me know what I can do from my side to help
with this.
>>>
>>> You c
On Fri, 22 Jun 2018, Al Viro wrote:
> On Fri, Jun 22, 2018 at 01:45:23PM +0100, David Howells wrote:
> > Reinette Chatre wrote:
> >
> > > Thomas and David, please let me know what I can do from my side to help
> > > with this.
> >
> > You could try basing on Al Viro's for-next tree which has the
On Fri, Jun 22, 2018 at 01:45:23PM +0100, David Howells wrote:
> Reinette Chatre wrote:
>
> > Thomas and David, please let me know what I can do from my side to help
> > with this.
>
> You could try basing on Al Viro's for-next tree which has the mount API
> changes in it.
Umm... That would be
Reinette Chatre wrote:
> Thomas and David, please let me know what I can do from my side to help
> with this.
You could try basing on Al Viro's for-next tree which has the mount API
changes in it. Sorry, I was hoping that this would go in the last merge
window, but I don't think Al has sufficie
On Thu, 21 Jun 2018, Reinette Chatre wrote:
> I am the contributor of the pseudo-locking related code that caused the
> conflict.
>
> Stephen, thank you very much for proceeding with the merge and fixing it
> up. I copied your later fix addition to this email and combined they
> look good. I did s
All,
On 6/21/2018 6:53 PM, Stephen Rothwell wrote:
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
>
> between commit:
>
> 58e4e43911f8 ("kernfs, sysfs, cgroup, intel_rdt: Support fs_context")
>
> from the vfs tree and commit:
>
>
Hi all,
On Fri, 22 Jun 2018 11:53:46 +1000 Stephen Rothwell
wrote:
>
> diff --cc arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
> index 38a54f56ff40,7b4a09d81a30..
> --- a/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
> +++ b/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
> @@@ -1270,9 -1861,16 +1842
On 05/07/2018 06:10 AM, Stephen Rothwell wrote:
> On Mon, 7 May 2018 12:09:09 +1000 Stephen Rothwell
> wrote:
>>
>> Today's linux-next merge of the tip tree got a conflict in:
>>
>> arch/x86/net/bpf_jit_comp.c
>>
>> between commit:
>>
>> e782bdcf58c5 ("bpf, x64: remove ld_abs/ld_ind")
>>
>> f
Hi all,
On Mon, 7 May 2018 12:09:09 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/x86/net/bpf_jit_comp.c
>
> between commit:
>
> e782bdcf58c5 ("bpf, x64: remove ld_abs/ld_ind")
>
> from the bpf-next tree and commit:
>
> 5f26c501
Hi All,
On Mon, 19 Mar 2018 14:06:57 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/bus/arm-cci.c
>
> between commit:
>
> 3de6be7a3dd8 ("drivers/bus: Split Arm CCI driver")
>
> from the arm-soc tree and commit:
>
> edb39592a58
On Tue, 27 Mar 2018, Stephen Rothwell wrote:
> Jiri, you could drop (or revert) the commit in your tree.
Dropped. Thanks,
--
Jiri Kosina
SUSE Labs
* Rafael J. Wysocki wrote:
> On Friday, March 23, 2018 7:09:24 AM CET Ingo Molnar wrote:
> >
> > * Stephen Rothwell wrote:
> >
> > > Hi all,
> > >
> > > Today's linux-next merge of the tip tree got a conflict in:
> > >
> > > kernel/sched/cpufreq_schedutil.c
> > >
> > > between commit:
>
On Friday, March 23, 2018 7:09:24 AM CET Ingo Molnar wrote:
>
> * Stephen Rothwell wrote:
>
> > Hi all,
> >
> > Today's linux-next merge of the tip tree got a conflict in:
> >
> > kernel/sched/cpufreq_schedutil.c
> >
> > between commit:
> >
> > 0953feed3400 ("cpufreq: schedutil: rate lim
* Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> kernel/sched/cpufreq_schedutil.c
>
> between commit:
>
> 0953feed3400 ("cpufreq: schedutil: rate limits for SCHED_DEADLINE")
Rafael, could you please send that to the scheduler tree?
* Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/x86/kvm/vmx.c
>
> between commit:
>
> c992384bde84 ("KVM: vmx: speed up MSR bitmap merge")
>
> from Linus' tree and commit:
>
> ff37dc0cd96c ("KVM/nVMX: Set the CPU_BASED_USE_M
- On Feb 9, 2018, at 1:25 PM, Will Deacon will.dea...@arm.com wrote:
> On Thu, Feb 08, 2018 at 07:04:56PM +, Mathieu Desnoyers wrote:
>> - On Feb 8, 2018, at 1:56 PM, Will Deacon will.dea...@arm.com wrote:
>>
>> > On Thu, Feb 08, 2018 at 08:03:50AM +0100, Ingo Molnar wrote:
>> >>
>>
On Thu, Feb 08, 2018 at 07:04:56PM +, Mathieu Desnoyers wrote:
> - On Feb 8, 2018, at 1:56 PM, Will Deacon will.dea...@arm.com wrote:
>
> > On Thu, Feb 08, 2018 at 08:03:50AM +0100, Ingo Molnar wrote:
> >>
> >> * Will Deacon wrote:
> >>
> >> > For the sake of avoiding the conflict, can
- On Feb 8, 2018, at 1:56 PM, Will Deacon will.dea...@arm.com wrote:
> On Thu, Feb 08, 2018 at 08:03:50AM +0100, Ingo Molnar wrote:
>>
>> * Will Deacon wrote:
>>
>> > For the sake of avoiding the conflict, can we just drop it for now, please?
>>
>> Yeah, so I resolved the conflict by mergi
On Thu, Feb 08, 2018 at 08:03:50AM +0100, Ingo Molnar wrote:
>
> * Will Deacon wrote:
>
> > For the sake of avoiding the conflict, can we just drop it for now, please?
>
> Yeah, so I resolved the conflict by merging the (already upstream) bits and
> Linus
> pulled that resolution. From now on
* Will Deacon wrote:
> For the sake of avoiding the conflict, can we just drop it for now, please?
Yeah, so I resolved the conflict by merging the (already upstream) bits and
Linus
pulled that resolution. From now on the level of comments you want there is up
to
you! :-)
Thanks,
I
On Tue, Feb 06, 2018 at 05:05:52PM +, Mathieu Desnoyers wrote:
> - On Feb 6, 2018, at 9:11 AM, Will Deacon will.dea...@arm.com wrote:
>
> > On Tue, Feb 06, 2018 at 02:06:50PM +, Mathieu Desnoyers wrote:
> >> - On Feb 6, 2018, at 8:55 AM, Will Deacon will.dea...@arm.com wrote:
> >>
- On Feb 6, 2018, at 9:11 AM, Will Deacon will.dea...@arm.com wrote:
> On Tue, Feb 06, 2018 at 02:06:50PM +, Mathieu Desnoyers wrote:
>> - On Feb 6, 2018, at 8:55 AM, Will Deacon will.dea...@arm.com wrote:
>> > On Tue, Feb 06, 2018 at 12:52:34PM +, Mathieu Desnoyers wrote:
>> >> On
On Tue, Feb 06, 2018 at 02:06:50PM +, Mathieu Desnoyers wrote:
> - On Feb 6, 2018, at 8:55 AM, Will Deacon will.dea...@arm.com wrote:
> > On Tue, Feb 06, 2018 at 12:52:34PM +, Mathieu Desnoyers wrote:
> >> One approach I would consider for this is to duplicate this
> >> comment and add
- On Feb 6, 2018, at 8:55 AM, Will Deacon will.dea...@arm.com wrote:
> On Tue, Feb 06, 2018 at 12:52:34PM +, Mathieu Desnoyers wrote:
>> - On Feb 5, 2018, at 7:40 PM, Stephen Rothwell s...@canb.auug.org.au
>> wrote:
>>
>> > Hi all,
>> >
>> > Today's linux-next merge of the tip tree
On Tue, Feb 06, 2018 at 12:52:34PM +, Mathieu Desnoyers wrote:
> - On Feb 5, 2018, at 7:40 PM, Stephen Rothwell s...@canb.auug.org.au
> wrote:
>
> > Hi all,
> >
> > Today's linux-next merge of the tip tree got a conflict in:
> >
> > arch/arm64/kernel/entry.S
> >
> > between commit:
>
- On Feb 5, 2018, at 7:40 PM, Stephen Rothwell s...@canb.auug.org.au wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/arm64/kernel/entry.S
>
> between commit:
>
> 4bf3286d29f3 ("arm64: entry: Hook up entry trampoline to exception vectors")
>
> fr
On Tue, Feb 06, 2018 at 11:54:38AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> include/linux/sched/mm.h
>
> between commit:
>
> d70f2a14b72a ("include/linux/sched/mm.h: uninline mmdrop_async(), etc")
FWIW, akpm has a patch th
Hi all,
On Wed, 1 Nov 2017 16:47:18 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/arm64/Kconfig
>
> between commit:
>
> 396a5d4a5c32 ("arm64: Unconditionally support
> {ARCH_}HAVE_NMI{_SAFE_CMPXCHG}")
>
> from the arm64 tree and c
Hi all,
On Mon, 30 Oct 2017 20:55:47 + Mark Brown wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> net/ipv4/tcp_output.c
>
> between commit:
>
> 6aa7de059173a ("locking/atomics: COCCINELLE/treewide: Convert trivial
> ACCESS_ONCE() patterns to READ_ONCE()/WRIT
Hi Mark,
On Wed, 11 Oct 2017 17:10:35 +0100 Mark Brown wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/s390/include/asm/spinlock.h
>
> between a series of commits adding wait queuing to s390 spinlocks
> from the s390 tree:
>
> eb3b7b848fb3dd00f7a57d633 s390/rw
Hi all,
On Wed, 11 Oct 2017 16:51:45 +0100 Mark Brown wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/s390/include/asm/rwsem.h
>
> between commit:
>
>91a1fad759ffd ("s390: use generic rwsem implementation")
>
> from the s390 tree and commit:
>
>a61ba
On Monday, November 6, 2017 3:10:40 AM CET Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/idle/intel_idle.c
>
> between commit:
>
> 0563bb7ba67e ("intel_idle: replace conditionals with
> static_cpu_has(X86_FEATURE_ARAT)")
>
>
Hi Alexei,
On Wed, 1 Nov 2017 09:27:14 -0700 Alexei Starovoitov
wrote:
>
> Also what do you mean by "same patch != same commit" ?
> Like if we had pushed to some 3rd tree first and then pulled
> into tip and net-next it would have been better?
Well, it would not have caused a conflict.
--
Chee
On Tue, Oct 31, 2017 at 10:53 PM, Stephen Rothwell
wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/powerpc/mm/numa.c
>
> between commit:
>
> cee5405da402 ("powerpc/hotplug: Improve responsiveness of hotplug change")
>
> from the powerpc tree and commi
On Wed, Nov 01, 2017 at 09:55:24AM +0100, Peter Zijlstra wrote:
> On Wed, Nov 01, 2017 at 09:27:43AM +0100, Ingo Molnar wrote:
> >
> > * Peter Zijlstra wrote:
> >
> > > On Wed, Nov 01, 2017 at 06:15:54PM +1100, Stephen Rothwell wrote:
> > > > Hi all,
> > > >
> > > > Today's linux-next merge of
On Wed, Nov 1, 2017 at 7:25 AM, Jens Axboe wrote:
> On 11/01/2017 12:10 AM, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the tip tree got a conflict in:
>>
>> drivers/block/amiflop.c
>>
>> between commit:
>>
>> f37ecbfc238b ("amifloppy: Convert timers to use timer_setup
On 11/01/2017 12:10 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/block/amiflop.c
>
> between commit:
>
> f37ecbfc238b ("amifloppy: Convert timers to use timer_setup()")
>
> from the block tree and commit:
>
> 3c557df67
Hi Peter,
On Wed, 1 Nov 2017 09:55:24 +0100 Peter Zijlstra wrote:
>
> Hmm, I thought having that same base patch in both trees would allow it
> to resolve that conflict. A well..
There is a difference between having he same patch and the same commit ...
--
Cheers,
Stephen Rothwell
* Peter Zijlstra wrote:
> On Wed, Nov 01, 2017 at 09:27:43AM +0100, Ingo Molnar wrote:
> >
> > * Peter Zijlstra wrote:
> >
> > > On Wed, Nov 01, 2017 at 06:15:54PM +1100, Stephen Rothwell wrote:
> > > > Hi all,
> > > >
> > > > Today's linux-next merge of the tip tree got a conflict in:
> > >
On Wed, Nov 01, 2017 at 09:27:43AM +0100, Ingo Molnar wrote:
>
> * Peter Zijlstra wrote:
>
> > On Wed, Nov 01, 2017 at 06:15:54PM +1100, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > Today's linux-next merge of the tip tree got a conflict in:
> > >
> > > kernel/trace/bpf_trace.c
> > >
>
* Peter Zijlstra wrote:
> On Wed, Nov 01, 2017 at 06:15:54PM +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the tip tree got a conflict in:
> >
> > kernel/trace/bpf_trace.c
> >
> > between commits:
> >
> > 97562633bcba ("bpf: perf event change needed for s
On Wed, Nov 01, 2017 at 06:15:54PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> kernel/trace/bpf_trace.c
>
> between commits:
>
> 97562633bcba ("bpf: perf event change needed for subsequent bpf helpers")
> and more changes ...
On Wed, 01 Nov 2017 07:53:59 +0100,
Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the tip tree got conflicts in:
>
> sound/oss/midibuf.c
> sound/oss/soundcard.c
> sound/oss/sys_timer.c
> sound/oss/uart6850.c
>
> between commit:
>
> 727dede0ba8a ("sound: Retire O
On Wed, Oct 11, 2017 at 06:23:29PM +0100, Will Deacon wrote:
> On Wed, Oct 11, 2017 at 05:10:35PM +0100, Mark Brown wrote:
> > I'm don't feel confident I can resolve this conflict sensibly without
> > taking too long so I've used the tip tree from yesterday.
> It's a shame that the conflict is so
Hi Mark,
On Wed, Oct 11, 2017 at 05:10:35PM +0100, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/s390/include/asm/spinlock.h
>
> between a series of commits adding wait queuing to s390 spinlocks
> from the s390 tree:
>
> eb3b7b848fb3dd00
Hi Dave,
On Thu, 31 Aug 2017 13:47:02 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/net/ethernet/cavium/liquidio/lio_main.c
>
> between commit:
>
> d1d97ee6e3a8 ("liquidio: moved liquidio_napi_drv_callback to lio_core.c")
>
> fr
Hi all,
On Mon, 28 Aug 2017 14:05:03 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> tools/Makefile
>
> between commit:
>
> e9d4650dcc59 ("spi: tools: add install section")
>
> from the spi tree and commit:
>
> ecda85e70277 ("x86/lgues
Hi all,
On Tue, 22 Aug 2017 13:50:57 +1000 Stephen Rothwell
wrote:
>
> Hi all,
>
> Today's linux-next merge of the tip tree got conflicts in:
>
> drivers/iommu/amd_iommu.c
> drivers/iommu/amd_iommu_init.c
> drivers/iommu/amd_iommu_proto.h
> drivers/iommu/amd_iommu_types.h
>
> between
Hi all,
On Tue, 22 Aug 2017 13:38:02 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/firmware/efi/libstub/arm64-stub.c
>
> between commit:
>
> 170976bcab07 ("efi/arm64: add EFI_KIMG_ALIGN")
>
> from the arm64 tree and commit:
>
>
Hi all,
On Fri, 11 Aug 2017 14:06:46 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> kernel/sched/fair.c
>
> between commit:
>
> 674e75411fc2 ("sched: cpufreq: Allow remote cpufreq callbacks")
>
> from the pm tree and commit:
>
> a030d
On 8/21/2017 10:50 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got conflicts in:
>
>drivers/iommu/amd_iommu.c
>drivers/iommu/amd_iommu_init.c
>drivers/iommu/amd_iommu_proto.h
>drivers/iommu/amd_iommu_types.h
>
> between commits:
>
>4c23
On 08/22/17 at 06:43pm, Stephen Rothwell wrote:
> Hi Baoquan,
>
> On Tue, 22 Aug 2017 16:01:28 +0800 Baoquan He wrote:
> >
> > On 08/22/17 at 05:49pm, Stephen Rothwell wrote:
> > > Hi Baoquan,
> > >
> > > On Tue, 22 Aug 2017 13:57:58 +0800 Baoquan He wrote:
> > > >
> > > > On 08/22/17 at 01:5
1 - 100 of 218 matches
Mail list logo
