History log of /openbmc/linux/drivers/zorro/.gitignore (Results 26 – 44 of 44)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
Revision tags: v2.6.29-rc5
# 89139374 11-Feb-2009 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.29-rc4' into x86/cleanups


Revision tags: v2.6.29-rc4
# cb5629b1 05-Feb-2009 James Morris <jmorris@namei.org>

Merge branch 'master' into next

Conflicts:
fs/namei.c

Manually merged per:

diff --cc fs/namei.c
index 734f2b5,bbc15c2..0000000
--- a/fs/namei.c
+++ b/fs/namei.c
@@@ -860,9 -848,8 +849,10 @@@ stat

Merge branch 'master' into next

Conflicts:
fs/namei.c

Manually merged per:

diff --cc fs/namei.c
index 734f2b5,bbc15c2..0000000
--- a/fs/namei.c
+++ b/fs/namei.c
@@@ -860,9 -848,8 +849,10 @@@ static int __link_path_walk(const char
nd->flags |= LOOKUP_CONTINUE;
err = exec_permission_lite(inode);
if (err == -EAGAIN)
- err = vfs_permission(nd, MAY_EXEC);
+ err = inode_permission(nd->path.dentry->d_inode,
+ MAY_EXEC);
+ if (!err)
+ err = ima_path_check(&nd->path, MAY_EXEC);
if (err)
break;

@@@ -1525,14 -1506,9 +1509,14 @@@ int may_open(struct path *path, int acc
flag &= ~O_TRUNC;
}

- error = vfs_permission(nd, acc_mode);
+ error = inode_permission(inode, acc_mode);
if (error)
return error;
+
- error = ima_path_check(&nd->path,
++ error = ima_path_check(path,
+ acc_mode & (MAY_READ | MAY_WRITE | MAY_EXEC));
+ if (error)
+ return error;
/*
* An append-only file must be opened in append mode for writing.
*/

Signed-off-by: James Morris <jmorris@namei.org>

show more ...


# bb960a1e 04-Feb-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'core/xen' into x86/urgent


# 8db0c5d5 02-Feb-2009 Dave Kleikamp <shaggy@linux.vnet.ibm.com>

Merge branch 'master' of /home/shaggy/git/linus-clean/


Revision tags: v2.6.29-rc3
# 5b74f9e0 25-Jan-2009 Thomas Gleixner <tglx@linutronix.de>

Merge branch 'linus' into timers/hrtimers


# dff243f7 22-Jan-2009 David Vrabel <david.vrabel@csr.com>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream


# 0ce1c383 20-Jan-2009 Ingo Molnar <mingo@elte.hu>

Merge commit 'v2.6.29-rc2' into x86/mm


# 4092762a 18-Jan-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/core


# b2b062b8 18-Jan-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'core/percpu' into stackprotector

Conflicts:
arch/x86/include/asm/pda.h
arch/x86/include/asm/system.h

Also, moved include/asm-x86/stackprotector.h to arch/x86/include/asm.

Signed-of

Merge branch 'core/percpu' into stackprotector

Conflicts:
arch/x86/include/asm/pda.h
arch/x86/include/asm/system.h

Also, moved include/asm-x86/stackprotector.h to arch/x86/include/asm.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

show more ...


# af37501c 18-Jan-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'core/percpu' into perfcounters/core

Conflicts:
arch/x86/include/asm/pda.h

We merge tip/core/percpu into tip/perfcounters/core because of a
semantic and contextual conflict: the forme

Merge branch 'core/percpu' into perfcounters/core

Conflicts:
arch/x86/include/asm/pda.h

We merge tip/core/percpu into tip/perfcounters/core because of a
semantic and contextual conflict: the former eliminates the PDA,
while the latter extends it with apic_perf_irqs field.

Resolve the conflict by moving the new field to the irq_cpustat
structure on 64-bit too.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

show more ...


# d1a02005 17-Jan-2009 Takashi Iwai <tiwai@suse.de>

Merge branch 'topic/usb-mixer-cache' into next/usb-audio


Revision tags: v2.6.29-rc2
# 5a2dd72a 16-Jan-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into irq/genirq


# af2519fb 16-Jan-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into core/iommu

Conflicts:
arch/ia64/include/asm/dma-mapping.h
arch/ia64/include/asm/machvec.h
arch/ia64/include/asm/machvec_sn2.h


# c0106d72 15-Jan-2009 Takashi Iwai <tiwai@suse.de>

Merge branch 'topic/asoc' into next/asoc


# 49a93bc9 15-Jan-2009 Ingo Molnar <mingo@elte.hu>

Merge branch 'linus' into cpus4096


# cb7a97d0 13-Jan-2009 Lachlan McIlroy <lachlan@redback.melbourne.sgi.com>

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus


# c088f4e9 13-Jan-2009 Lachlan McIlroy <lachlan@redback.melbourne.sgi.com>

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6


# 3b1b7195 12-Jan-2009 Linus Torvalds <torvalds@linux-foundation.org>

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (30 commits)
m68k: Fix -

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (30 commits)
m68k: Fix --build-id breakage for sun3
m68k: Wire up sys_restart_syscall
fbdev: Kill Atari vblank cursor blinking
m68k: zorro - Use %pR to print resources
m68k: dio - Kill resource_size_t format warnings
m68k: dmasound - Kill warn_unused_result warnings
m68k: zorro - Kill warn_unused_result warnings
m68k: dio - Kill warn_unused_result warnings
m68k: atafb - Kill warn_unused_result warnings
m68k: amiserial - Kill warn_unused_result warnings
m68k: ser_a2232 - Kill warn_unused_result warnings
m68k: vme_scc - Kill warn_unused_result warnings
m68k: sun3 core - Kill warn_unused_result warnings
m68k: mvme147 core - Kill warn_unused_result warnings
m68k: mac core - Kill warn_unused_result warnings
m68k: hp300 core - Kill warn_unused_result warnings
m68k: atari core - Kill warn_unused_result warnings
m68k: apollo core - Kill warn_unused_result warnings
m68k: amiga core - Kill warn_unused_result warnings
m68k: Kill several external declarations in source files
...

show more ...


Revision tags: v2.6.29-rc1, v2.6.28, v2.6.28-rc9, v2.6.28-rc8, v2.6.28-rc7
# dc8ee69c 21-Nov-2008 Kars de Jong <jongk@linux-m68k.org>

m68k: zorro - Add devlist.h and gen-devlist to .gitignore

drivers/zorro/.gitignore: Added devlist.h and gen-devlist to .gitignore file
because they shouldn't be tracked.

Signed-off-by: Kars de Jong

m68k: zorro - Add devlist.h and gen-devlist to .gitignore

drivers/zorro/.gitignore: Added devlist.h and gen-devlist to .gitignore file
because they shouldn't be tracked.

Signed-off-by: Kars de Jong <jongk@linux-m68k.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

show more ...


12