Changes in exception_policy.conf.default

e5451c8f8330e03ad3cfa16048b4daf961af434f - Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochip

Tue, 23 Feb 2016 15:07:08 +0100

Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochipBase for demv_gpiochip_add_data() and devm_gpiochip_remove(). List of files: /linux/security/tomoyo/policy/exception_policy.conf.default

01b944fe1cd4e21a2a9ed51adbdbafe2d5e905ba - Merge branch 'next' into for-linus

Thu, 03 Sep 2015 19:01:44 +0200

Merge branch 'next' into for-linusPrepare first round of input updates for 4.3 merge window. List of files: /linux/security/tomoyo/policy/exception_policy.conf.default

c57d5621d2f2dc238f4b9c4d00b2a54187a75445 - Merge tag 'v4.2-rc3' into next

Mon, 20 Jul 2015 19:08:17 +0200

Merge tag 'v4.2-rc3' into nextSync up with Linux 4.2-rc3 to bring in infrastructure (OF) pieces. List of files: /linux/security/tomoyo/policy/exception_policy.conf.default

ec3b34e1975670e68be3abff76f56dbb41dd417c - Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4.2/rmi', 'for-4.2/sensor-hub', 'for-4.2/sjoy', 'for-4.2/sony' and 'for-4.2/wacom' into for-linus

Mon, 22 Jun 2015 16:23:43 +0200

Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4.2/rmi', 'for-4.2/sensor-hub', 'for-4.2/sjoy', 'for-4.2/sony' and 'for-4.2/wacom' into for-linusConflicts: drivers/hid/wacom_wac.c List of files: /linux/security/tomoyo/policy/exception_policy.conf.default

6724af486903df57338c14424e02599e371cf563 - Merge branch 'fix/fsl-dspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-fsl-dspi

Tue, 09 Jun 2015 19:35:46 +0200

Merge branch 'fix/fsl-dspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-fsl-dspi List of files: /linux/security/tomoyo/policy/exception_policy.conf.default

31eb07f5f8febab3d68b9d1a350d9e5a4bdf6780 - Merge tag 'mac80211-next-for-davem-2015-05-06' into iwlwifi-next

Thu, 28 May 2015 12:36:49 +0200

Merge tag 'mac80211-next-for-davem-2015-05-06' into iwlwifi-nextLots of updates for net-next for this cycle. As usual, we havea lot of small fixes and cleanups, the bigger items are: * proper mac80211 rate control locking, to fix some random crashes (this required changing other locking as well) * mac80211 "fast-xmit", a mechanism to reduce, in most cases, the amount of code we execute while going from ndo_start_xmit() to the driver * this also clears the way for properly supporting S/G and checksum and segmentation offloads List of files: /linux/security/tomoyo/policy/exception_policy.conf.default

7ae383be81781c5e1347f71c3eb0d53ce5188200 - Merge branch 'linus' into x86/asm, before applying dependent patch

Fri, 08 May 2015 13:33:33 +0200

Merge branch 'linus' into x86/asm, before applying dependent patchSigned-off-by: Ingo Molnar List of files: /linux/security/tomoyo/policy/exception_policy.conf.default

b3e5ced63e051e8f911b795ac5b06229a5328f7b - Merge tag 'v4.1-rc1' into patchwork

Mon, 27 Apr 2015 15:32:45 +0200

Merge tag 'v4.1-rc1' into patchworkLinux 4.1-rc1* tag 'v4.1-rc1': (11651 commits) Linux 4.1-rc1 x86_64, asm: Work around AMD SYSRET SS descriptor attribute issue v4l: xilinx: fix for include file movement platform/chrome: chromeos_laptop - instantiate Atmel at primary address RCU pathwalk breakage when running into a symlink overmounting something fix I_DIO_WAKEUP definition direct-io: only inc/dec inode->i_dio_count for file systems fs/9p: fix readdir() Btrfs: prevent list corruption during free space cache processing toshiba_acpi: Do not register vendor backlight when acpi_video bl is available x86: fix special __probe_kernel_write() tail zeroing case crypto: img-hash - CRYPTO_DEV_IMGTEC_HASH should depend on HAS_DMA crypto: x86/sha512_ssse3 - fixup for asm function prototype change nios2: rework cache nios2: Add types.h header required for __u32 type ALSA: hda - fix headset mic detection problem for one more machine eth: bf609 eth clock: add pclk clock for stmmac driver probe blackfin: Wire up missing syscalls Btrfs: fix inode cache writeout ACPI / scan: Add a scan handler for PRP0001 ... List of files: /linux/security/tomoyo/policy/exception_policy.conf.default

64131a87f2aae2ed9e05d8227c5b009ca6c50d98 - Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus

Tue, 21 Apr 2015 11:33:03 +0200

Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus* 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux: (9717 commits) media-bus: Fixup RGB444_1X12, RGB565_1X16, and YUV8_1X24 media bus format hexdump: avoid warning in test function fs: take i_mutex during prepare_binprm for set[ug]id executables smp: Fix error case handling in smp_call_function_*() iommu-common: Fix PARISC compile-time warnings sparc: Make LDC use common iommu poll management functions sparc: Make sparc64 use scalable lib/iommu-common.c functions Break up monolithic iommu table/lock into finer graularity pools and lock sparc: Revert generic IOMMU allocator. tools/power turbostat: correct dumped pkg-cstate-limit value tools/power turbostat: calculate TSC frequency from CPUID(0x15) on SKL tools/power turbostat: correct DRAM RAPL units on recent Xeon processors tools/power turbostat: Initial Skylake support tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support for O= option in Makefile tools/power turbostat: modprobe msr, if needed tools/power turbostat: dump MSR_TURBO_RATIO_LIMIT2 tools/power turbostat: use new MSR_TURBO_RATIO_LIMIT names Bluetooth: hidp: Fix regression with older userspace and flags validation config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected perf/x86/intel/pt: Fix and clean up error handling in pt_event_add() ...That solves several merge conflicts: Documentation/DocBook/media/v4l/subdev-formats.xml Documentation/devicetree/bindings/vendor-prefixes.txt drivers/staging/media/mn88473/mn88473.c include/linux/kconfig.h include/uapi/linux/media-bus-format.hThe ones at subdev-formats.xml and media-bus-format.h are not trivial.That's why we opted to merge from DRM. List of files: /linux/security/tomoyo/policy/exception_policy.conf.default

2c33ce009ca2389dbf0535d0672214d09738e35e - Merge Linus master into drm-next

Mon, 20 Apr 2015 03:32:26 +0200

Merge Linus master into drm-nextThe merge is clean, but the arm build fails afterwards,due to API changes in the regulator tree.I've included the patch into the merge to fix the build.Signed-off-by: Dave Airlie List of files: /linux/security/tomoyo/policy/exception_policy.conf.default

d488d3a4ce08e96dad5cb3b6117517d57ccec98f - Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Wed, 15 Apr 2015 20:08:27 +0200

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-securityPull security subsystem updates from James Morris: "Highlights for this window: - improved AVC hashing for SELinux by John Brooks and Stephen Smalley - addition of an unconfined label to Smack - Smack documentation update - TPM driver updates"* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (28 commits) lsm: copy comm before calling audit_log to avoid race in string printing tomoyo: Do not generate empty policy files tomoyo: Use if_changed when generating builtin-policy.h tomoyo: Use bin2c to generate builtin-policy.h selinux: increase avtab max buckets selinux: Use a better hash function for avtab selinux: convert avtab hash table to flex_array selinux: reconcile security_netlbl_secattr_to_sid() and mls_import_netlbl_cat() selinux: remove unnecessary pointer reassignment Smack: Updates for Smack documentation tpm/st33zp24/spi: Add missing device table for spi phy. tpm/st33zp24: Add proper wait for ordinal duration in case of irq mode smack: Fix gcc warning from unused smack_syslog_lock mutex in smackfs.c Smack: Allow an unconfined label in bringup mode Smack: getting the Smack security context of keys Smack: Assign smack_known_web as default smk_in label for kernel thread's socket tpm/tpm_infineon: Use struct dev_pm_ops for power management MAINTAINERS: Add Jason as designated reviewer for TPM tpm: Update KConfig text to include TPM2.0 FIFO chips tpm/st33zp24/dts/st33zp24-spi: Add dts documentation for st33zp24 spi phy ... List of files: /linux/security/tomoyo/policy/exception_policy.conf.default

3add594bf60a901ba973cdcdafd47af2aac0ac1c - Merge branch 'tomoyo-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild into next

Mon, 13 Apr 2015 04:07:47 +0200

Merge branch 'tomoyo-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild into next List of files: /linux/security/tomoyo/policy/exception_policy.conf.default

f02dee2d148ba854464e7dbf09f1241ee159173a - tomoyo: Do not generate empty policy files

Thu, 15 Jan 2015 10:39:22 +0100

tomoyo: Do not generate empty policy filesThe Makefile automatically generates the tomoyo policy files, which arenot removed by make clean (because they could have been provided by theuser). Instead of generating the missing files, use /dev/null if agiven file is not provided. Store the default exception_policy inexception_policy.conf.default.Acked-by: Tetsuo Handa Signed-off-by: Michal Marek List of files: /linux/security/tomoyo/policy/exception_policy.conf.default