On Mon, Apr 8, 2019 at 1:15 PM Dmitry V. Levin wrote:
> On Mon, Apr 08, 2019 at 11:31:31AM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the audit tree got conflicts in:
> >
> > arch/mips/kernel/ptrace.c
> > kernel/seccomp.c
> >
> > between commit:
> >
> > b3
On Mon, Apr 08, 2019 at 11:31:31AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the audit tree got conflicts in:
>
> arch/mips/kernel/ptrace.c
> kernel/seccomp.c
>
> between commit:
>
> b35f549df1d7 ("syscalls: Remove start and number from
> syscall_get_argume
Hi all,
Today's linux-next merge of the audit tree got conflicts in:
arch/mips/kernel/ptrace.c
kernel/seccomp.c
between commit:
b35f549df1d7 ("syscalls: Remove start and number from syscall_get_arguments()
args")
from Linus' tree and commit:
16add411645c ("syscall_get_arch: add "stru
On Thu, Mar 23, 2017 at 10:18 PM, Stephen Rothwell
wrote:
> Hi Paul,
>
> Today's linux-next merge of the audit tree got a conflict in:
>
> net/netfilter/xt_AUDIT.c
>
> between commit:
>
> 613dbd95723a ("netfilter: x_tables: move hook state into xt_action_param
> structure")
>
> from Linus' t
On 2017-03-24 13:18, Stephen Rothwell wrote:
> Hi Paul,
Hi Stephen,
> Today's linux-next merge of the audit tree got a conflict in:
>
> net/netfilter/xt_AUDIT.c
>
> between commit:
>
> 613dbd95723a ("netfilter: x_tables: move hook state into xt_action_param
> structure")
>
> from Linus'
Hi Paul,
Today's linux-next merge of the audit tree got a conflict in:
net/netfilter/xt_AUDIT.c
between commit:
613dbd95723a ("netfilter: x_tables: move hook state into xt_action_param
structure")
from Linus' tree and commit:
36fe46d172e5 ("audit: normalize NETFILTER_PKT")
from the au
On 2017-01-19 13:51, Stephen Rothwell wrote:
> Hi Paul,
Hi Stephen,
> Today's linux-next merge of the audit tree got a conflict in:
>
> include/uapi/linux/audit.h
>
> between commits:
>
> 7ff89ac608d9 ("audit: add exclude filter extension to feature bitmap")
> dcdaa2f9480c ("Merge branch
Hi Paul,
Today's linux-next merge of the audit tree got a conflict in:
include/uapi/linux/audit.h
between commits:
7ff89ac608d9 ("audit: add exclude filter extension to feature bitmap")
dcdaa2f9480c ("Merge branch 'stable-4.10' of
git://git.infradead.org/users/pcmoore/audit")
from Linus
On Tue, Nov 22, 2016 at 5:35 AM, Richard Guy Briggs wrote:
> On 2016-11-22 16:29, Stephen Rothwell wrote:
>> Hi Paul,
>
> Hi Stephen,
>
>> Today's linux-next merge of the audit tree got a conflict in:
>>
>> include/uapi/linux/audit.h
>>
>> between commit:
>>
>> 7ff89ac608d9 ("audit: add exclud
On 2016-11-22 16:29, Stephen Rothwell wrote:
> Hi Paul,
Hi Stephen,
> Today's linux-next merge of the audit tree got a conflict in:
>
> include/uapi/linux/audit.h
>
> between commit:
>
> 7ff89ac608d9 ("audit: add exclude filter extension to feature bitmap")
>
> from Linus' tree and commit
Hi Paul,
Today's linux-next merge of the audit tree got a conflict in:
include/uapi/linux/audit.h
between commit:
7ff89ac608d9 ("audit: add exclude filter extension to feature bitmap")
from Linus' tree and commit:
0489410368df ("audit: add support for session ID user filter")
from the
Hi Richard,
On Thu, 19 Nov 2015 13:30:12 -0500 Richard Guy Briggs wrote:
>
> Stephen, your patch looks fine to me. I had some minor concerns about
> deeper issues as to whether the original intent of that part of the
> audit subsystem was affected by this change, but that is WRT the
> conflictin
On 15/11/19, Paul Moore wrote:
> On Wed, Nov 18, 2015 at 8:06 PM, Stephen Rothwell
> wrote:
> > Hi Paul,
> >
> > Today's linux-next merge of the audit tree got a conflict in:
> >
> > kernel/audit.c
> >
> > between commit:
> >
> > d0164adc89f6 ("mm, page_alloc: distinguish between being unable
On Wed, Nov 18, 2015 at 8:06 PM, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the audit tree got a conflict in:
>
> kernel/audit.c
>
> between commit:
>
> d0164adc89f6 ("mm, page_alloc: distinguish between being unable to sleep,
> unwilling to sleep and avoiding waking k
Hi Paul,
Today's linux-next merge of the audit tree got a conflict in:
kernel/audit.c
between commit:
d0164adc89f6 ("mm, page_alloc: distinguish between being unable to sleep,
unwilling to sleep and avoiding waking kswapd")
from Linus' tree and commit:
14eeba1d242e ("audit: include aud
On Tuesday, October 06, 2015 01:55:01 PM Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the audit tree got a conflict in:
>
> include/linux/lsm_audit.h
>
> between commit:
>
> 671a2781ff01 ("security: add ioctl specific auditing to lsm_audit")
>
> from Linus' tree and c
Hi Paul,
Today's linux-next merge of the audit tree got a conflict in:
include/linux/lsm_audit.h
between commit:
671a2781ff01 ("security: add ioctl specific auditing to lsm_audit")
from Linus' tree and commit:
43cfd5e38587 ("audit: constify parts of common_audit_data and
lsm_network_au
On 15/08/07, Stephen Rothwell wrote:
> Hi Paul,
Hi Stephen,
> Today's linux-next merge of the audit tree got a conflict in:
>
> kernel/audit.c
>
> between commit:
>
> 5985de6754a6 ("audit: code clean up")
>
> from Linus' tree and commit:
>
> 84cb777e6781 ("audit: use macros for unset i
Hi Paul,
Today's linux-next merge of the audit tree got a conflict in:
kernel/audit.c
between commit:
5985de6754a6 ("audit: code clean up")
from Linus' tree and commit:
84cb777e6781 ("audit: use macros for unset inode and device values")
from the audit tree.
I fixed it up (see below)
On 15/06/01, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the audit tree got a conflict in
> security/lsm_audit.c between commit 5deeb5cece3f ("lsm: copy comm
> before calling audit_log to avoid race in string printing") from Linus'
> tree and commit 5c5bc97e2fc8 ("lsm: renam
Hi Paul,
Today's linux-next merge of the audit tree got a conflict in
security/lsm_audit.c between commit 5deeb5cece3f ("lsm: copy comm
before calling audit_log to avoid race in string printing") from Linus'
tree and commit 5c5bc97e2fc8 ("lsm: rename duplicate labels in
LSM_AUDIT_DATA_TASK audit m
On Mon, Jan 19, 2015 at 11:04 PM, Stephen Rothwell
wrote:
> Hi Paul,
>
> Today's linux-next merge of the audit tree got a conflict in
> include/linux/audit.h between commit 041d7b98ffe5 ("audit: restore
> AUDIT_LOGINUID unset ABI") from Linus' tree and commit e80da768eae4
> ("audit: remove vestig
Hi Paul,
Today's linux-next merge of the audit tree got a conflict in
include/linux/audit.h between commit 041d7b98ffe5 ("audit: restore
AUDIT_LOGINUID unset ABI") from Linus' tree and commit e80da768eae4
("audit: remove vestiges of vers_ops") from the audit tree.
I fixed it up (see below) and ca
Hi Paul,
Today's linux-next merge of the audit tree got a conflict in fs/exec.c
between commit 51f39a1f0cea ("syscalls: implement execveat() system
call") from Linus' tree and commit 5dc5218840e1 ("fs: create proper
filename objects using getname_kernel()") from the audit tree.
I fixed it up (see
Hi Paul,
Today's linux-next merge of the audit tree got a conflict in
kernel/auditsc.c between commit 4a92843601ad ("audit: correctly record
file names with different path name types") and fcf22d8267ad ("audit:
create private file name copies when auditing inodes") from Linus' tree
and commits 997
Hi Eric,
Today's linux-next merge of the audit tree got a conflict in
arch/mips/kernel/ptrace.c between commits 6e34574603f6 ("MIPS: asm:
syscall: Define syscall_get_arch") and 1225eb825208("MIPS: ptrace: Move
away from secure_computing_strict") from Linus' tree and commit
8ea408a0c1e7 ("ARCH: AUD
On Wed, 2014-04-16 at 14:02 +1000, Stephen Rothwell wrote:
> You could have avoided this by doing a fast forward merge of v3.15-rc1
> instead of the v3.14 merge (since everything in your tree before that
> merge was also in Linus' tree by v3.15-rc1).
This is a situation I've never really known th
Hi Eric,
Today's linux-next merge of the audit tree got conflicts in
arch/mips/include/asm/syscall.h, arch/x86/Kconfig and kernel/audit.c
between commits from Linus' tree and commit 596b0569084b ("Merge tag
'v3.14' into mergeing") from the audit tree.
This happened because you merged Linus' tag v
Hi Richard,
On Tue, 1 Apr 2014 08:54:13 -0400 Richard Guy Briggs wrote:
>
> > [Eric: that audit tree commit has no Signed-off-by from you even though
> > you committed it ... there are a few like that]
>
> I added my Signed-off to the list posting.
The point is that Eric (Paris) committed your
On 14/04/01, Stephen Rothwell wrote:
> Hi Eric,
Hi Stephen,
> Today's linux-next merge of the audit tree got a conflict in
> kernel/audit.c between commit aa4af831bb4f ("AUDIT: Allow login in
> non-init namespaces") from Linus' tree and commit 5a3cb3b6c3a0 ("audit:
> allow user processes to log f
Hi Eric,
Today's linux-next merge of the audit tree got a conflict in
kernel/audit.c between commit aa4af831bb4f ("AUDIT: Allow login in
non-init namespaces") from Linus' tree and commit 5a3cb3b6c3a0 ("audit:
allow user processes to log from another PID namespace") from the audit
tree.
I fixed it
Hi Eric,
Today's linux-next merge of the audit tree got a conflict in
include/net/xfrm.h between commit d511337a1eda ("xfrm.h: Remove extern
from function prototypes") from Linus' tree and commit 4440e8548153
("audit: convert all sessionid declaration to unsigned int") from the
audit tree.
I fixe
Hi Eric,
Today's linux-next merge of the audit tree got a conflict in fs/exec.c
between commit(s) from Linus' tree and commit 9410d228a4cf ("audit: call
audit_bprm() only once to add AUDIT_EXECVE information") from the audit
tree.
I fixed it up (using the supplied resolution - thanks - see below)
33 matches
Mail list logo
