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")
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
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
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:
>
>
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
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:
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:
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:
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
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
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
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
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
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
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
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
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
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
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
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
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:
>
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
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
Hi all,
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:
a3dbd01e6c9d ("x86/intel_rdt: Create character device
Hi all,
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:
a3dbd01e6c9d ("x86/intel_rdt: Create character device
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/mm/fault.c
between commit:
df720ac12fc7 ("exceptions: detritus removal")
from the vfs tree and commit:
744c193eb9a2 ("x86: Migrate exception table users off module.h and onto
extable.h")
from the tip tree.
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/mm/fault.c
between commit:
df720ac12fc7 ("exceptions: detritus removal")
from the vfs tree and commit:
744c193eb9a2 ("x86: Migrate exception table users off module.h and onto
extable.h")
from the tip tree.
28 matches
Mail list logo
